Merge branch 'upstream'
authorBernd Zeimetz <bernd@bzed.de>
Thu, 22 Apr 2010 15:48:18 +0000 (17:48 +0200)
committerBernd Zeimetz <bernd@bzed.de>
Thu, 22 Apr 2010 15:48:18 +0000 (17:48 +0200)

Trivial merge